Minor edit, exit event duplicates messages