Fixing template not found issue