[Fix] Better handling of events