Make sure shipping state is recorded. Closes #283