Fixing issue with event propagation.