Fix for command line tool