Keychain should work now correctly