Fixed a cleanup bug where the entity would not be rebound after a reload