One more fix for incorrect indices.