Client fixed (17/37)

Client fixed