Fixed Calc entry problem