Client fixed (23/37)

Client fixed