Fixed issue with delegated events bubbling