Fix for missing order data