fixed event selector, better notification