CFY-516 minor fix