Fixed bug with new order number generation