diff --git a/Cartfile.resolved b/Cartfile.resolved
index c0c8ac95..41d6a033 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "MacPass/KeePassKit" "2.4.4"
+github "MacPass/KeePassKit" "2.4.7"
 github "mstarke/HNHUi" "3.0"
 github "robbiehanson/KissXML" "5.2.3"
 github "sparkle-project/Sparkle" "1.20.0"
diff --git a/MacPass/MPTreeDelegate.m b/MacPass/MPTreeDelegate.m
index 7a373eed..d35b640d 100644
--- a/MacPass/MPTreeDelegate.m
+++ b/MacPass/MPTreeDelegate.m
@@ -99,10 +99,9 @@
   return (response == NSModalResponseOK) ? pickFieldViewController.pickedValue : @"";
 }
 
-- (NSString *)tree:(KPKTree *)tree resolvePickCharsPlaceholderForEntry:(KPKEntry *)entry field:(NSString *)field options:(NSString *)options {
-  NSString *value = [[entry valueForAttributeWithKey:field] kpk_finalValueForEntry:entry];
+- (NSString *)tree:(KPKTree *)tree resolvePickCharsPlaceholderForValue:(NSString *)value options:(NSString *)options {
   if(value.length == 0) {
-    return @""; // error while retrieving source value
+    return @"";
   }
   MPPickcharsParser *parser = [[MPPickcharsParser alloc] initWithOptions:options];
   MPPickcharsViewController *pickCharViewController = [[MPPickcharsViewController alloc] init];