fix build issue, take 3