Fix Affix jumping around