Fixed concurrency issue
Merge pull request #88 from g-ortuno/concurrency-problem

Fixes concurrency issues.