CalculatorFactory fix