Client fixed (6/37)

Client fixed