CFY-959 path fix