CFY-1688 fixed bug.