CFY-606 fix format