Race fix