[FIX] Avoid creating multiple identities