Fixing race recognition