Removed keyring stuff - doesn't help at all