Fixed entity updates