fix build error from previous merge