Race hotfix
Merge pull request #2 from rafaelgonzalez/races-hotfix

Races hotfix