Bug fix for missing template