Fix the client sometimes would not retry (#109)

Fix the client sometimes would not retry (#109) #215