fixed CF8/9 compat issue