Change super call for safety