diff --git a/VENCalculatorInputView/VENCalculatorInputTextField.m b/VENCalculatorInputView/VENCalculatorInputTextField.m
index 2ee8afa..4a625a7 100644
--- a/VENCalculatorInputView/VENCalculatorInputTextField.m
+++ b/VENCalculatorInputView/VENCalculatorInputTextField.m
@@ -84,6 +84,17 @@ - (void)calculatorInputView:(VENCalculatorInputView *)inputView didTapKey:(NSStr
         if ([secondToLastCharacterString isEqualToString:[self decimalSeparator]]) {
             self.text = subString;
         }
+        if([subString rangeOfString:@"+"].location != NSNotFound ||
+           [subString rangeOfString:@"−"].location != NSNotFound ||
+           [subString rangeOfString:@"×"].location != NSNotFound ||
+           [subString rangeOfString:@"÷"].location != NSNotFound
+           ){
+            if([[subString componentsSeparatedByString:[self decimalSeparator]] count] > 2){
+             self.text = subString;
+            }
+        }else if ([subString rangeOfString:[self decimalSeparator]].location != NSNotFound){
+            self.text = subString;
+        }
     }
 }