Small change to calc-eval. Should now work as intended.