CFY-959 small fix