Fix affix issue