Bug fix - stop event propagation
0.23.58