Tweak for possibe race