Fix bootstrapping on connenction change