Hunting race condition.
Fix race conditions.