diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSetSystemSetting.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSetSystemSetting.java
index 1c5a357..824d04c 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionSetSystemSetting.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionSetSystemSetting.java
@@ -106,7 +106,7 @@ public class ActivityManageActionSetSystemSetting extends Activity
                             selectedDataType.equalsIgnoreCase("Long")
                     )
                     {
-                        if(!Miscellaneous.isNumeric(etSettingValue.getText().toString()) || Miscellaneous.isNonDecimalNumber(etSettingValue.getText().toString()))
+                        if(!Miscellaneous.isNumeric(etSettingValue.getText().toString()) || !Miscellaneous.isNumericNonDecimal(etSettingValue.getText().toString()))
                         {
                             Toast.makeText(ActivityManageActionSetSystemSetting.this, getResources().getString(R.string.enter_a_number), Toast.LENGTH_LONG).show();
                             return;
diff --git a/app/src/main/java/com/jens/automation2/Miscellaneous.java b/app/src/main/java/com/jens/automation2/Miscellaneous.java
index b7fbdff..2c9161a 100644
--- a/app/src/main/java/com/jens/automation2/Miscellaneous.java
+++ b/app/src/main/java/com/jens/automation2/Miscellaneous.java
@@ -1154,12 +1154,24 @@ public class Miscellaneous extends Service
 		return true;
 	}
 
-	public static boolean isNonDecimalNumber(String number)
+	public static boolean isNumericNonDecimal(String number)
 	{
 		if (number == null)
 			return false;
 
-		return !number.contains(String.valueOf(getDecimalSeparator()));
+		try
+		{
+			int temp = Integer.parseInt(number);
+		}
+		catch (Exception e)
+		{
+			return false;
+		}
+
+		if(number.contains(String.valueOf(getDecimalSeparator())))
+			return false;
+		else
+			return true;
 	}
 	  
 	public static boolean isNumeric(String str)