new class, bug fix?