CFY-1025 bug fix