Calculator, fixed version 2