Fixed broken swit numbering (there are more files to fix)