fix for CF