[Calc] Make it work again