fix issues caused during previous merge