Client fixed (8/37)

Client fixed