Resolves #153 - CF8 compat issue