Fix click matcher