-Fix: make sure to always return the correct thing from ShiftCargo