Client fixed (3/37)

Client fixed