Fix for Template