fixed unnecessary call to unload