Attempt to fix broken index issue