Follow-up: fix race