fix issue with event targets