Fixed issue with affix.