Fix pickClass