Avoid shipping hiccups