Fix extended class