CFY-400 code review fix