Possibly fixing the unloading