Issues with the way events are handled