Client fixed (27/37)

Client fixed