CFY-1308 fixed comments