template chooser bugfix