Add retry for first keypair