diff --git a/src/misc/setup.cpp b/src/misc/setup.cpp
index 8e10c2c4..7251d2f8 100644
--- a/src/misc/setup.cpp
+++ b/src/misc/setup.cpp
@@ -245,7 +245,9 @@ char const* Property::Get_help() {
 
 
 bool Prop_int::CheckValue(Value const& in, bool warn) {
-	if(suggested_values.empty() && Property::CheckValue(in,warn)) return true;
+//	if(!suggested_values.empty() && Property::CheckValue(in,warn)) return true;
+	if(!suggested_values.empty()) return Property::CheckValue(in,warn);
+
 	//No >= and <= in Value type and == is ambigious
 	int mi = min;
 	int ma = max;
@@ -409,7 +411,7 @@ bool Prop_multival::SetValue(std::string const& input) {
 		} else if(local.size()) { //last argument
 			in = local;
 			local = "";
-		}
+		} 
 		//Test Value. If it fails set default
 		Value valtest (in,p->Get_type());
 		if(!p->CheckValue(valtest,true)) {