Fix self call to be super call