Fix order of variables.