fixing issue with some objets not being unloaded