Fix index issue
2.6.3