Fixed bug where click handlers where removed from wrong element.