Fix affix. Closes #4