Fixing the numbering