Client fixed (11/37)

Client fixed