Fix for CI Job