Temporary workaround for keys with multiple identities