Fix initial state of border discovery