Bugfix entity out of position with modification