Client fixed (35/37)

Client fixed