1 files changed, 5 insertions, 6 deletions

diff --git a/lib/Transforms.hs b/lib/Transforms.hs
index 118b494..473ecbc 100644
--- a/lib/Transforms.hs
+++ b/lib/Transforms.hs
@@ -151,6 +151,8 @@ signature_time ov = case (if null cs then ds else cs) of
             creationTime (SignatureCreationTimePacket t) = [t]
             creationTime _                               = []
 
+matchingGrip :: Packet -> String -> Bool
+matchingGrip topk g = matchpr 0 g topk == g
 
 -- | Given list of subpackets, a master key, one of its subkeys and a
 -- list of signatures on that subkey, yields:
@@ -177,9 +179,8 @@ findTag tag topk subkey subsigs = (xs',minsig,ys')
                           (sig, do
                                 sig <- Just (packet . fst $ sig)
                                 guard (isSignaturePacket sig)
-                                guard $ flip isSuffixOf
-                                             (show $ fingerprint topk)
-                                        . fromMaybe "%bad%" 
+                                guard $ matchingGrip topk
+                                        . fromMaybe "%bad%"
                                         . signature_issuer
                                         $ sig
                                 listToMaybe $
@@ -483,9 +484,7 @@ keyFlags0 wkun uidsigs = concat
                               , BZip2
                               , ZIP
                               ]
-    features = filterOr isfeatures subs $
-               FeaturesPacket { supports_mdc = True
-                              }
+    features = filterOr isfeatures subs defaultFeatures
 
     filterOr pred xs def = if null rs then [def] else rs where rs=filter pred xs