Fixed a problem caused by the previous merge.