Fix commandline tool