Fixed a cf3 issue
Merge pull request #823 from KevWright/master

Fixed a cf3 issue