Fixed classselection