CFY-1468 fix