more aggressive anti-race condition hack