Command line tool fix.
0.8.5