network settings handling fixed