Fix regression on connection retry