Resolves #232 CF8 Compat issue