Fix for last race condition

@finnschiermer @tgoyne