Client fixed (5/37)

Client fixed