CF8 version
CF8 fix-up