fix to always use original template