fix for CF Api changes