diff --git a/src/S3Zip/ZipUtilities.cs b/src/S3Zip/ZipUtilities.cs
index f95353e2a034d2438bb0547b4499f3a1e70f9820..40889c87cf6ea01f1508ee23652104a31c3a9313 100644
--- a/src/S3Zip/ZipUtilities.cs
+++ b/src/S3Zip/ZipUtilities.cs
@@ -96,7 +96,7 @@ namespace Coscine.S3Zip
         {
             foreach (ZipArchiveEntry entry in archive.Entries)
             {
-                var fileName = directoryInfo.FullName.EndsWith($"{Path.DirectorySeparatorChar}") ? $"{directoryInfo.FullName}{entry.FullName}" : directoryInfo.FullName + $"{directoryInfo.FullName}{Path.DirectorySeparatorChar}{entry.FullName}";
+                var fileName = Path.Combine(directoryInfo.FullName, entry.FullName);
 
                 if (!Directory.Exists(Path.GetDirectoryName(fileName)))
                 {