better connection problem with peer handling