Fixes shipping state fix