Fix for new template