Update events for Issue #327