BugFix on NetworkManager