race fixes