Add bugfix for wrong extended class