moved fixLabel to Entity