Fixing issues with propagating events.