3w-xxxx: fix command completion race