CFY-1433 bug fix