CFID generation hotfix