Fixed class selection.