CFY-646 bug fix