Fixed regression caused by merge.