Client fixed (25/37)

Client fixed