changed inconsistent connection behaviour (case 2 and 3 a+b)