Tentative fix for CI build