until this can be fixed
Merge pull request #155 from aholachek/template-error-shim

until this can be fixed