BUG: Fixed an index conflict issue