Fix for occasional index wackiness