Fix click behavior