MT#7941 Another fix for empty CF dsets.