Fixed to avoid adding duplicated index