Fix issue event handling