fix Client Class