diff --git a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
index 1f17c6909fa22cb051616671e0cfa425ae755e34..44ff8c18b6d6934397782b51e4098aaeed21c8de 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
@@ -1266,7 +1266,7 @@ public class ServiceRepoService {
                 resourcename = firstToken ;  //example "cr0fc1234-amf"       
               }
               
-              Boolean resourceIsSameKind = aService.checkIsKindResource(res);
+              Boolean resourceIsSameKind = aService.checkIsKindResource(res) || aService.getServiceCharacteristicByName("Kind")==null; //either Kind is the same or simply does not exist. Then behave the same
               if (resourceIsSameKind) { //if this service is the same kind as the resource then don't prefix the characteristic
                 kind = "";
                 resourcename="";