CFY-598 small change