Fixed previous merge