Fixing the keychain