(#2402) - Fixing affix offsets