diff --git a/html/admin/js/graphViewer/graph/nodeReducer.js b/html/admin/js/graphViewer/graph/nodeReducer.js
index 839bb36a03..334d3767cd 100644
--- a/html/admin/js/graphViewer/graph/nodeReducer.js
+++ b/html/admin/js/graphViewer/graph/nodeReducer.js
@@ -148,7 +148,7 @@ function NodeReducer(nodes, edges) {
      _.each(nodes, function (n) {
        var id = n._id,
          c1, c2;
-       if (id == sID || id == lID) {
+       if (id === sID || id === lID) {
          return null;
        }
        c1 = getDQValue(dQ, id, sID);
@@ -277,6 +277,7 @@ function NodeReducer(nodes, edges) {
       res = [],
       dist = {},
       dist2 = {},
+      detectSteps = true,
       sortByDistance = function (a, b) {
         var d1 = dist[_.min(a,minDist(dist))],
           d2 = dist[_.min(b,minDist(dist))],
@@ -290,7 +291,9 @@ function NodeReducer(nodes, edges) {
       throw "Load some nodes first.";
     }
     populateValues(dQ, a, heap);
-    while (communityDetectionStep(dQ, a, heap, coms)) {}
+    while (detectSteps) {
+      detectSteps = communityDetectionStep(dQ, a, heap, coms);
+    }
     res = _.pluck(_.values(coms), "com");
     if (focus !== undefined) {
       dist = floatDist(focus._id);
diff --git a/html/admin/js/graphViewer/jasmine_test/specAdapter/arangoAdapterSpec.js b/html/admin/js/graphViewer/jasmine_test/specAdapter/arangoAdapterSpec.js
index fe9c106020..c682776db3 100644
--- a/html/admin/js/graphViewer/jasmine_test/specAdapter/arangoAdapterSpec.js
+++ b/html/admin/js/graphViewer/jasmine_test/specAdapter/arangoAdapterSpec.js
@@ -921,8 +921,7 @@
               expect(nodes.length).toEqual(3);
               existEdge("community_1", c3);
               existEdge("community_1", c4);
-              expect(edges.length).toEqual(2);
-            
+              expect(edges.length).toEqual(2);    
               expect(called).toBeTruthy();
             });
             
diff --git a/html/admin/js/graphViewer/jasmine_test/specNodeReducer/nodeReducerSpec.js b/html/admin/js/graphViewer/jasmine_test/specNodeReducer/nodeReducerSpec.js
index 73d69f90d0..384b37d18e 100644
--- a/html/admin/js/graphViewer/jasmine_test/specNodeReducer/nodeReducerSpec.js
+++ b/html/admin/js/graphViewer/jasmine_test/specNodeReducer/nodeReducerSpec.js
@@ -149,7 +149,7 @@
           edges.push(helper.createSimpleEdge(nodes, 5, 7));
           
           var com = reducer.getCommunity(6);
-          expect(com).toContainNodes([0, 1, 2]);
+          expect(com).toContainNodes([0, 1, 2, 3]);
         });
         
       });