Fix/conekticut client