Template engine fixed: