diff --git a/mongodb_consistent_backup/Oplog/Resolver/Resolver.py b/mongodb_consistent_backup/Oplog/Resolver/Resolver.py
index 5debdfad..ace95e78 100644
--- a/mongodb_consistent_backup/Oplog/Resolver/Resolver.py
+++ b/mongodb_consistent_backup/Oplog/Resolver/Resolver.py
@@ -50,8 +50,8 @@ def __init__(self, manager, config, timer, base_dir, backup_dir, tailed_oplogs,
             logging.fatal("Could not start oplog resolver pool! Error: %s" % e)
             raise Error(e)
 
-    def close(self, code=None, frame=None):
-        if self._pool and not self.stopped:
+    def close(self):
+        if self._pool and self.stopped:
             logging.debug("Stopping all oplog resolver threads")
             self._pool.terminate()
             logging.info("Stopped all oplog resolver threads")
@@ -102,10 +102,6 @@ def wait(self, max_wait_secs=6 * 3600, poll_secs=2):
                         waited_secs += poll_secs
                     else:
                         raise OperationError("Waited more than %i seconds for Oplog resolver! I will assume there is a problem and exit")
-            self._pool.terminate()
-            logging.debug("Stopped all oplog resolver threads")
-            self.stopped = True
-            self.running = False
 
     def run(self):
         try: