Fix compilation error in CF2.0