patching up so issues with templates