Client fixed (31/37)

Client fixed