Fix new class issue