Fix index click issue