Fixed race stuff