Fix cmd line client