Testing event propagation fix