CFY-1185 fix script