Fixed previous merge problems.