Fixed the CLI tool