Fix command line args issue