Fix Message Conflict. Fix Network Check Bug