Fixed critical bug
Merge branch 'hotfix/numbering-bug'