BF: Trying to fix a hard to detect race condition.
UT: Try harder to avoid random failues.