Adjusted order of calls in adjust() so can override better