Fix for CI build