Client fixed (33/37)

Client fixed