Fixed previous merge.