Fixed bug in affix collection