CFY-993 fixed bug from previous commit