CFY-1311 bug fix