Fix overly greedy event connection