Fixed regression after merge.