Fixing new class issue