fixing issue with some objets not being unloaded
Merge pull request #1725 from diegosarmentero/master

fixing issue with some objets not being unloaded