Fix short client code