diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp
index f4dddc0f..330be0a7 100644
--- a/src/ebusd/main.cpp
+++ b/src/ebusd/main.cpp
@@ -767,9 +767,9 @@ result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolS
 						matches = true;
 						break;
 					}
-					if (remain[remain.length()-1]!='0')
+					if (remain[remain.length()-1]<'0' || remain[remain.length()-1]>'9')
 						break;
-					remain.erase(remain.length()-1);
+					remain.erase(remain.length()-1); // remove trailing digit
 				}
 				if (matches)
 					match += remain.length();