fix unloading