bugfix in class selection