Fixes Hung connections

hopefully i didnt miss anythin...