Fix multiple event bug