CFY-1316 fix