Fix command line argument ordering