Fix order of command line switches.