Fixed selecting first class without shuffeling