Fix problem caused by previous merge.