Client fixed (24/37)

Client fixed