Fix order number to be a separate task