Fixing numbering