Fixed common case in client.py