Bugfix: Prevent order number error