Unload logic fixed