Solve small issue in unloading objects