diff --git a/core/ArchiveExtractor.py b/core/ArchiveExtractor.py
index 6e1c1d31ce8d381c818e5c37aaba48c4199415e3..fa5023000b2c03b7e561d73d2b2da3e8c705de9d 100755
--- a/core/ArchiveExtractor.py
+++ b/core/ArchiveExtractor.py
@@ -447,7 +447,7 @@ class ArchiveExtractor:
             None if failed after the amount of retries.
         """
 
-        for i in range(retry-1):
+        for i in range(retry):
             # Make retrieval request
             self.logger.debug("Execute %s (%s)"%(cmd, arg))
             try:
@@ -455,12 +455,12 @@ class ArchiveExtractor:
             except tango.DevFailed as e:
                 self.logger.warning("The extractor device returned the following error:")
                 self.logger.warning(e)
+                if  i == retry-1:
+                    logger.error("Could not execute command %s (%s). Check the device extractor"%(cmd, arg))
+                    return None
                 self.logger.warning("Retrying...")
                 continue
             break
-        if i==2:
-            logger.error("Could not execute command %s (%s). Check the device extractor"%(cmd, arg))
-            return None
         return cmdreturn