Attempt #4 to fix build error