Yet another attempt to fix build