fixed latch waiting if somehow first-connection fails