Yet another fix for CDF.