blah, hacky fix for some races