Fix bug in numbering