Fixed unload bug