Attempt fix to CIS Context Eventing