Fixed the choose class glitch that was caused by the last commit