CFY-1574 refix old bug (CFY-1442)