Minor bugfix for new class