fix unload method