fix for previous merge