CFY-1046 fix