Fixed order creation bug