Fixing issue with duplicate globalEvents