Make sure that the right event type is always triggered (was causing problems with...