Fix slowdown in the client