CFY-959 fix vars access