Updated after seeing race condition on -dev