Fix issue with wrong class name