Fix a race condition problem

I've fixed #3857.

And I am sorry. I didn't know my commit was notified to upstream automatically. 
I shouldn't have done force-push.
Umm ..
What does @lorenzo mean?
I thoud he said this var name is not bad.
Was I wrong?