Client fixed (22/37)

Client fixed