Fixing disconnect & reconnect