possible build fix from previous merge