entity serialize fix