1 files changed, 12 insertions, 9 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 8a4d870..b3dc97e 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -2481,14 +2481,10 @@ initializeMissingPEMFiles operation ctx grip mwk decrypt db = do
 
         let (missing,notmissing) = partition (\(_,_,ns,_)->null (ns >>= snd)) $ do
                 (fname,stream) <- nonexistents
-                let internalInitializer StreamInfo
-                        { initializer = Internal _
-                        , spill       = KF_Match tag } = Just tag
-                    internalInitializer _              = Nothing
-                    mutableTag
+                let mutableTag
                         | isMutable stream = usageFromFilter (fill stream)
                         | otherwise        = Nothing
-                usage <- maybeToList $ internalInitializer stream `mplus` mutableTag
+                usage <- maybeToList mutableTag
                 -- TODO: Report error if generating without specifying usage tag.
                 let (topspec,subspec) = parseSpec (fromMaybe "" grip) usage
                     -- ms will contain duplicates if a top key has multiple matching
@@ -2539,12 +2535,19 @@ initializeMissingPEMFiles operation ctx grip mwk decrypt db = do
            try v $ \(db,import_rs) -> do
 
            -- generateInternals
-           let internals = mapMaybe getParams missing
+           let internals = mapMaybe getParams nonexistents
                 where
-                    getParams (fname,subspec,ms,stream) =
+                    getParams (fname,stream) =
                         case initializer stream of
-                            Internal p -> Just (p, stream)
+                            Internal p -> do _ <- internalInitializer stream
+                                             Just (p, stream)
                             _          -> Nothing
+
+                    internalInitializer StreamInfo
+                        { initializer = Internal _
+                        , spill       = KF_Match tag } = Just tag
+                    internalInitializer _              = Nothing
+
            v <- generateInternals decrypt mwk db internals
 
            try v $ \(db,internals_rs) -> do