Fixed a cf3 issue