Bugfix for TemplateSwitcher check