Client fixed (34/37)

Client fixed