Fixed double unloading