diff --git a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
index 83f89f44..762ff3ec 100644
--- a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
+++ b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
@@ -168,7 +168,7 @@ Public Class ImportZUGFeRDFiles
                     For Each oFile In oFileGroupFiles
                         Dim oResult As ProcessFileResult = ProcessFile(oMessageId, oEmailDataBase, oZUGFeRDCount, oFile, oConnections, oArgs)
 
-                        If oResult.ZugferdFileFound = False Then
+                        If oResult.ZugferdFileFound = True Then
                             _logger.Debug("Zugferd File found")
                             oMD5CheckSum = oResult.MD5Checksum
                             oZUGFeRDCount = oResult.ZugferdFileCount
@@ -478,6 +478,7 @@ Public Class ImportZUGFeRDFiles
 
         ' Since extraction went well, increase the amount of ZUGFeRD files
         pZugferdFiles += 1
+        _logger.Info("Zugferd file found. Increasing counter.")
 
         ' Extract all attachments with the extensions specified in `AllowedExtensions`.
         ' If you need to extract and use embedded xml files, you need to filter out the zugferd-invoice.xml yourself.
@@ -533,7 +534,7 @@ Public Class ImportZUGFeRDFiles
 
         oResult.ZugferdFileFound = True
         oResult.MD5Checksum = oMD5Checksum
-        oResult.ZugferdFileCount = pZugferdFiles + 1
+        oResult.ZugferdFileCount = pZugferdFiles
 
         Return oResult