CFY-1313 fix constants reference