CFY-1046 bug fix