So the fix is to remove the shaft, take everything apart, replace the plastic rivets, re assemble and reinstall