Fixed issue with previous merge