Client fixed (18/37)

Client fixed