Attempt #3 to fix build error