trying to fix some affix issues