Fix CalculatorEventImpl