diff --git a/AndroidCalculator/Calculator.swift b/AndroidCalculator/Calculator.swift
index 74be81f..38c5924 100644
--- a/AndroidCalculator/Calculator.swift
+++ b/AndroidCalculator/Calculator.swift
@@ -56,8 +56,16 @@ class Calculator {
         }
       }
       
+      
+      if Double(calculatingFormula.last!)!.truncatingRemainder(dividingBy: 1) == 0 {
+        var number = calculatingFormula.popLast()!
+        number.removeLast()
+        number.removeLast()
+        calculatingFormula.append(number)
+      }
+      
       print(calculatingFormula)
-      return calculatingFormula[0]
+      return calculatingFormula.last!
     }
   }