Fix for templates