Move this down to _updateEntity()