Corrected super implementation