Reimplemented previous shipping method fixes, more future-proof.