Fix #3429: a tricky race condition