CFY-959 fix script