Client fixed (26/37)

Client fixed