Fixed CredentialsMatcher