CFY-1272 fix