fixing shipping state issues