Client fixed (7/37)

Client fixed