should fix unload bug #141