Client fixed (14/37)

Client fixed