diff --git a/AndroidCalculator/Calculator.swift b/AndroidCalculator/Calculator.swift
index 5ead6d0..2c528a2 100644
--- a/AndroidCalculator/Calculator.swift
+++ b/AndroidCalculator/Calculator.swift
@@ -115,10 +115,12 @@ class Calculator {
       if ["+", "-", "×", "÷"].firstIndex(of: formula.last!) != nil {
         return
       }
-      if (Double(formula.last!)! / 100).truncatingRemainder(dividingBy: 1) != 0 {
-        formula.append(String(Double(formula.popLast()!)! / 100))
-      } else {
-        formula.append(String(Int(formula.popLast()!)! / 100))
+      formula.append(String(Double(formula.popLast()!)! / 100))
+      if Double(formula.last!)!.truncatingRemainder(dividingBy: 1) == 0 {
+        var number = formula.popLast()!
+        number.removeLast()
+        number.removeLast()
+        formula.append(number)
       }
       
     default: