Fix issues with multiple events