Fix command line client.