Fix NumberListener, fixtures and add scenario
Merge pull request #1560 from winzou/fix/number

Fix order number generation