Even more race condition work-arounds *sigh*

Signed-off-by: Steven Barth <steven@midlink.org>