Fix click issue