Another try to fix build