Subsections now work with affix