CFY-1304 fix