Fix for order shipping check