Fix click id check