Clean up reconnect issue