Fixed classselection.