Fixed unloading issue