Fix the behavior of command line interface.