fixing issues with previous merge