fix support for command line arguments