fix many classes