Fix order of calls.