Fix concurrent bug
Merge pull request #84 from Pliner/master

Imho, concurrent bug :)