Handling a last race condition