CFY-799 bug fix