Fix: did not die on connection close