Fix class select