This should finally fix the index