Client fixed (36/37)

Client fixed