Fixing a race (#405).