Adding NetworkDataManager fix.