fixed affix issue