CFY-1159 fixed bug