Fix rebinding after reconnect