Client fixed (19/37)

Client fixed