Temp fix for templates