Fix the missing index issue