Fix on change to call super