diff --git a/src/main/java/org/ndgf/endit/AbstractEnditNearlineStorage.java b/src/main/java/org/ndgf/endit/AbstractEnditNearlineStorage.java
index cd39c65..69c1f23 100644
--- a/src/main/java/org/ndgf/endit/AbstractEnditNearlineStorage.java
+++ b/src/main/java/org/ndgf/endit/AbstractEnditNearlineStorage.java
@@ -22,7 +22,6 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
 
 import java.io.IOException;
 import java.net.URI;
@@ -127,7 +126,7 @@ public ListenableFuture<Set<URI>> apply(Void ignored) throws Exception
                                              return schedule(task);
                                          }
                                      }
-                                 }, MoreExecutors.directExecutor());
+                                 }, executor());
     }
 
     @Override
@@ -143,7 +142,7 @@ public ListenableFuture<Void> apply(Void ignored) throws Exception
                                       {
                                           return request.allocate();
                                       }
-                                  }, MoreExecutors.directExecutor()),
+                                  }, executor()),
                 new AsyncFunction<Void, Set<Checksum>>()
                 {
                     @Override
@@ -156,6 +155,6 @@ public ListenableFuture<Set<Checksum>> apply(Void ignored) throws Exception
                             return schedule(task);
                         }
                     }
-                }, MoreExecutors.directExecutor());
+                }, executor());
     }
 }