Quickfix for template performance

There were some issues with performance of templates in 1.4.0.
I was not able to reproduce the problem, but I hope this can fix it.