fixed affix - ready for more templates