Fix for race case