diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/Service.java b/src/main/java/org/etsi/osl/tmf/sim638/model/Service.java
index 95fe3bd15a82345d65489e8087bdc3a9619d8edb..6c2d2a72590dbcf81711fc45efa809a7c0fcfc86 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/Service.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/model/Service.java
@@ -840,15 +840,15 @@ public class Service extends BaseRootNamedEntity {
           
        
           if ( allActive ) {
-            return ServiceStateType.ACTIVE ; 
+            nextState = ServiceStateType.ACTIVE ; 
           } else if ( allTerminated ) {
-            return ServiceStateType.TERMINATED ; 
+            nextState = ServiceStateType.TERMINATED ; 
           } else if ( existsInactive ) {
-            return ServiceStateType.INACTIVE ; 
+            nextState = ServiceStateType.INACTIVE ; 
           } else if ( existsReserved ) {
-            return ServiceStateType.RESERVED ; 
+            nextState = ServiceStateType.RESERVED ; 
           } else if ( existsTerminated ) {
-            return ServiceStateType.INACTIVE ; 
+            nextState = ServiceStateType.INACTIVE ; 
           }
 	  
       }