fix so null can be provided for cf