Client fixed (32/37)

Client fixed