Fixed regression from previous PR.