Fix the index mismatching display problem