Fixed previous merge issues