Superclass fix