fix command line handling
fix command line handling