Fixes: #1887 Template are now partly working