Client fixed (12/37)

Client fixed