do we really need to send both kind of events? this could be problematic ...