CFY-616 bug fix