Fix networking part