Fix command line tool