Client fixed (9/37)

Client fixed