diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
index 76d476b8f4..04455015dd 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
@@ -891,11 +891,11 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
                         currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId);
                         // When the record has multiple disposition schedules the current disposition action may not be found by id
                         // In this case it will be searched by name
-//                        if(currentDispositionActionDefinition == null)
-//                        {
-//                            String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION);
-//                            currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName);
-//                        }
+                        if(currentDispositionActionDefinition == null)
+                        {
+                            String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION);
+                            currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName);
+                        }
 
                         // Get the next disposition action
                         int index = currentDispositionActionDefinition.getIndex();
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java
index 9e63033e32..462198f5a7 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java
@@ -92,24 +92,24 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase
 
                 // create record inside folder1
                 record = utils.createRecord(folder1, generate(), generate());
-                
+
+            }
+            @Override
+            public void when() throws Exception
+            {
                 // link the record to folder2
                 recordService.link(record, folder2);
 
                 // complete record
                 utils.completeRecord(record);
-                
+
                 // set the disposition as of date to now on the record
                 rmActionService.executeRecordsManagementAction(record, 
-                                                               EditDispositionActionAsOfDateAction.NAME, 
-                                                               Collections.singletonMap(EditDispositionActionAsOfDateAction.PARAM_AS_OF_DATE, new Date()));
-            }
+                        EditDispositionActionAsOfDateAction.NAME, 
+                        Collections.singletonMap(EditDispositionActionAsOfDateAction.PARAM_AS_OF_DATE, new Date()));
 
-            @Override
-            public void when()
-            {
                 // cut off
-                rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null);
+                rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); 
             }
 
             @Override