Minor fix for the rebase of #645.