Fixing Issue #172 with modern events