Fixed removal of mouseListener in addClickListener()