diff --git a/NgxExport/Tools/Subrequest.hs b/NgxExport/Tools/Subrequest.hs
--- a/NgxExport/Tools/Subrequest.hs
+++ b/NgxExport/Tools/Subrequest.hs
@@ -51,7 +51,7 @@
 import qualified Data.Binary as Binary
 import           Data.HashSet (HashSet)
 import qualified Data.HashSet as HS
-import           Data.CaseInsensitive (FoldCase (foldCase), mk, original)
+import           Data.CaseInsensitive hiding (map)
 import           Data.Aeson
 import           Data.Maybe
 import           Data.Word
@@ -263,8 +263,6 @@
               case fromException e of
                   Just (HttpExceptionRequest _ c) ->
                       case c of
-                          StatusCodeException r _ ->
-                              (0, statusCode $ responseStatus r, [], "")
                           Network.HTTP.Client.ResponseTimeout -> response502
                           ConnectionTimeout -> response502
                           ConnectionFailure _ -> response502
@@ -564,9 +562,8 @@
     -> L.ByteString
 extractHeaderFromFullResponse v =
     let (h, b) = mk *** C8.tail $ C8.break ('|' ==) v
-        hs = (\(_, _, a, _) -> map (first mk) a) $
-            Binary.decode @FullResponse $ L.fromStrict b
-    in maybe "" L.fromStrict $ lookup h hs
+        (_, _, hs, _) = Binary.decode @FullResponse $ L.fromStrict b
+    in maybe "" L.fromStrict $ lookup h $ map (first mk) hs
 
 ngxExportYY 'extractHeaderFromFullResponse
 
@@ -656,12 +653,13 @@
     let (_, st, hs, b) = Binary.decode @FullResponse $ L.fromStrict v
         hs' = map (first mk) hs
         ct = fromMaybe "" $ lookup (mk "Content-Type") hs'
-        hs'' = filter (\(n, _) -> not $
-                          mk n `HS.member` headersToDelete ||
-                              deleteXAccel &&
-                                  foldCase "X-Accel-" `B.isPrefixOf` foldCase n
-                      ) hs
-    in (b, ct, st, hs'')
+        hs'' = filter
+            (\(n, _) -> not $
+                n `HS.member` headersToDelete ||
+                    deleteXAccel &&
+                        foldCase "X-Accel-" `B.isPrefixOf` foldedCase n
+            ) hs'
+    in (b, ct, st, map (first original) hs'')
 
 fromFullResponse :: ByteString -> ContentHandlerResult
 fromFullResponse = contentFromFullResponse notForwardableResponseHeaders True
diff --git a/ngx-export-tools-extra.cabal b/ngx-export-tools-extra.cabal
--- a/ngx-export-tools-extra.cabal
+++ b/ngx-export-tools-extra.cabal
@@ -1,5 +1,5 @@
 name:                       ngx-export-tools-extra
-version:                    0.5.4.0
+version:                    0.5.4.1
 synopsis:                   More extra tools for Nginx haskell module
 description:                More extra tools for
         <https://github.com/lyokha/nginx-haskell-module Nginx haskell module>.