diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
index 55ba2cedc88aed0b680920ba206b33a86041d28d..07e4961cb4672d9897f68795876be0e2b7adf03b 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
@@ -118,9 +118,9 @@ public class DataMover
                 public boolean terminate()
                 {
                     boolean ok = true;
-                    for (int i = 0; i < terminables.length; i++)
+                    for (ITerminable terminable : terminables)
                     {
-                        ok = ok && terminables[i].terminate();
+                        ok = ok && terminable.terminate();
                     }
                     return ok;
                 }