#9 - Fixing Template Toolkit usage issue