Command-line options fix