Fix bug template singleton