diff --git a/src/main/java/org/commonvox/bigdatademos/RiakTest.java b/src/main/java/org/commonvox/bigdatademos/RiakTest.java
index 26830e1..413fe7e 100644
--- a/src/main/java/org/commonvox/bigdatademos/RiakTest.java
+++ b/src/main/java/org/commonvox/bigdatademos/RiakTest.java
@@ -50,7 +50,12 @@ public static void main(String [] args) throws UnknownHostException {
         System.out.println("Shutting down client!");
         // NOTE: #shutdown may hang indefinitely:
         //   https://github.com/basho/riak-java-client/issues/706
-        myNodeClient.shutdown();
+//        myNodeClient.shutdown();
+        for (RiakNode node : riakNodes) {
+            System.out.println("Shutting down NODE: " + node.getRemoteAddress());
+            node.shutdown();
+        }
+
         
     }
 }