Attempt 2 to fix build error