New attempt to fix build