Fixing command line tool