Added the 1x1 field fix and made it optional