Bug fix in command line