Applied upstream fix for command line options