Bugfix (though it didn't affect performance in the recent test).