Use consistent numbering

Fixes #585