NULL bug fixed in calc.cis