Fixed SafeReconnect again