Client fixed (13/37)

Client fixed