fix race for real