diff --git a/hnix-store-nar/src/System/Nix/Nar/Options.hs b/hnix-store-nar/src/System/Nix/Nar/Options.hs
index 5ef5dcae..867026a1 100644
--- a/hnix-store-nar/src/System/Nix/Nar/Options.hs
+++ b/hnix-store-nar/src/System/Nix/Nar/Options.hs
@@ -20,10 +20,7 @@ data NarOptions = NarOptions {
 
 defaultNarOptions :: NarOptions
 defaultNarOptions = NarOptions {
-  optUseCaseHack =
-    if System.Info.os == "darwin"
-      then True
-      else False
+  optUseCaseHack = System.Info.os == "darwin"
 }
 
 caseHackSuffix :: Text
diff --git a/hnix-store-nar/src/System/Nix/Nar/Parser.hs b/hnix-store-nar/src/System/Nix/Nar/Parser.hs
index d8ac3092..52bc3152 100644
--- a/hnix-store-nar/src/System/Nix/Nar/Parser.hs
+++ b/hnix-store-nar/src/System/Nix/Nar/Parser.hs
@@ -320,7 +320,7 @@ parseDirectory = do
     conflictCount <- getFilePathConflictCount key
     pure $
       if conflictCount > 0 then
-        fName <> Nar.caseHackSuffix <> (Text.pack $ show conflictCount)
+        fName <> Nar.caseHackSuffix <> Text.pack (show conflictCount)
       else
         fName
 
diff --git a/hnix-store-nar/src/System/Nix/Nar/Streamer.hs b/hnix-store-nar/src/System/Nix/Nar/Streamer.hs
index 08f92a1a..82a6a760 100644
--- a/hnix-store-nar/src/System/Nix/Nar/Streamer.hs
+++ b/hnix-store-nar/src/System/Nix/Nar/Streamer.hs
@@ -12,7 +12,7 @@ module System.Nix.Nar.Streamer
 
 import Data.ByteString (ByteString)
 import Data.Int (Int64)
-import Data.Text (Text)
+import qualified Data.Map.Strict                 as Map
 
 import           Control.Monad                    ( forM_
                                                   , when
@@ -23,7 +23,7 @@ import qualified Data.ByteString.Lazy            as Bytes.Lazy
 import qualified Data.Foldable
 import qualified Data.List
 import qualified Data.Serialize                  as Serial
-import qualified Data.Text                       as T (pack, breakOn)
+import qualified Data.Text                       as T (pack, unpack)
 import qualified Data.Text.Encoding              as TE (encodeUtf8)
 import           System.FilePath                 ((</>))
 
@@ -92,18 +92,21 @@ streamNarIOWithOptions opts effs basePath yield = do
         isDir <- IO.liftIO $ Nar.narIsDir effs path
         if isDir then do
           fs <- IO.liftIO (Nar.narListDir effs path)
+          let entries =
+                foldr (\f acc ->
+                  let
+                    name =
+                      if Nar.optUseCaseHack opts
+                      then undoCaseHack f
+                      else f
+                  in Map.insert name f acc
+                ) Map.empty fs
           yield $ strs ["type", "directory"]
-          forM_ (Data.List.sort fs) $ \f -> do
+          forM_ (Map.toAscList entries) $ \(unhacked, original) -> do
             yield $ str "entry"
             parens $ do
-              let fullName = path </> f
-              let serializedPath =
-                    if Nar.optUseCaseHack opts then
-                      filePathToBSWithCaseHack f
-                    else
-                      filePathToBS f
-              yield $ strs ["name", serializedPath, "node"]
-              parens $ go fullName
+              yield $ strs ["name", filePathToBS unhacked, "node"]
+              parens $ go (path </> original)
         else do
           isExec <- IO.liftIO $ Nar.narIsExec effs path
           yield $ strs ["type", "regular"]
@@ -148,8 +151,10 @@ strs xs = Bytes.concat $ str <$> xs
 filePathToBS :: FilePath -> ByteString
 filePathToBS = TE.encodeUtf8 . T.pack
 
-filePathToBSWithCaseHack :: FilePath -> ByteString
-filePathToBSWithCaseHack = TE.encodeUtf8 . undoCaseHack . T.pack
-
-undoCaseHack :: Text -> Text
-undoCaseHack = fst . T.breakOn Nar.caseHackSuffix
+undoCaseHack :: FilePath -> FilePath
+undoCaseHack f =
+  case Data.List.findIndex (caseHackSuffix `Data.List.isPrefixOf`) (Data.List.tails f) of
+     Just index -> take index f
+     Nothing -> f
+  where
+    caseHackSuffix = T.unpack Nar.caseHackSuffix