Fixed issue on no network cases