Client fixed (29/37)

Client fixed