Fixed command-line client