Fix order of commands