CFY-644 small bug fix