diff --git a/src/udi/handlers/sve/sve.go b/src/udi/handlers/sver/sver.go
similarity index 97%
rename from src/udi/handlers/sve/sve.go
rename to src/udi/handlers/sver/sver.go
index fe64147..bc841f8 100644
--- a/src/udi/handlers/sve/sve.go
+++ b/src/udi/handlers/sver/sver.go
@@ -157,7 +157,7 @@ func (self *SingleValueExtractorHandler) Handle(message handler.MessageT) {
       lost("no payloadRegex defined, devicePart can't be used", message)
       return
     }
-    if self.config.devicePart >= len(subTopics) {
+    if self.config.devicePart >= len(payloadMatches) {
       lost("devicePart out of range", message)
       return
     }
@@ -183,7 +183,7 @@ func (self *SingleValueExtractorHandler) Handle(message handler.MessageT) {
       lost("no payloadRegex defined, valuePart can't be used", message)
       return
     }
-    if self.config.valuePart >= len(subTopics) {
+    if self.config.valuePart >= len(payloadMatches) {
       lost("valuePart out of range", message)
       return
     }
@@ -204,7 +204,7 @@ func (self *SingleValueExtractorHandler) Handle(message handler.MessageT) {
       lost("no payloadRegex defined, unitPart can't be used", message)
       return
     }
-    if self.config.unitPart >= len(subTopics) {
+    if self.config.unitPart >= len(payloadMatches) {
       lost("unitPart out of range", message)
       return
     }