Fixing issue where we prevent event bubbling.

Closes #81