CFY-1049 small fix