Client fixed (15/37)

Client fixed