Resolve a race condition