Fix Mask numbering