Possibly fixing race