Fix issues with viewers in click event