Improve affix behaviour