Try to fix build again