Fixed a small bug where switching zones would cause entity lockups