BUG: Fixed index issue