Fixes race