diff --git a/info/container.go b/info/container.go
index 7cff0e32..16e47442 100644
--- a/info/container.go
+++ b/info/container.go
@@ -230,37 +230,21 @@ func (self uint64Slice) Swap(i, j int) {
 	self[i], self[j] = self[j], self[i]
 }
 
-func (self uint64Slice) Percentiles(ps ...int) []uint64 {
+func (self uint64Slice) Percentiles(requestedPercentiles ...int) []percentile {
 	if len(self) == 0 {
 		return nil
 	}
-	ret := make([]uint64, 0, len(ps))
+	ret := make([]percentile, 0, len(requestedPercentiles))
 	sort.Sort(self)
-	for _, p := range ps {
-		idx := (float64(p) / 100.0) * float64(len(self)+1)
-		if idx > float64(len(self)-1) {
-			ret = append(ret, self[len(self)-1])
-		} else {
-			ret = append(ret, self[int(idx)])
-		}
-	}
-	return ret
-}
-
-// as contains percentages and bs containes the corresponding values.
-// This function will pair values in as and bs to construct a list of percentile.
-// len(bs) <= len(as)
-func intZipuint64(as []int, bs []uint64) []percentile {
-	if len(bs) == 0 {
-		return nil
-	}
-	ret := make([]percentile, len(bs))
-	for i, b := range bs {
-		a := as[i]
-		ret[i] = percentile{
-			Percentage: a,
-			Value:      b,
-		}
+	for _, p := range requestedPercentiles {
+		idx := (len(self) * p / 100) - 1
+		ret = append(
+			ret,
+			percentile{
+				Percentage: p,
+				Value:      self[idx],
+			},
+		)
 	}
 	return ret
 }
@@ -280,8 +264,6 @@ func (self *ContainerStatsPercentiles) FillPercentiles(cpuPercentages, memoryPer
 		memUsages = append(memUsages, sample.Memory.Usage)
 	}
 
-	cpuPercentiles := uint64Slice(cpuUsages).Percentiles(cpuPercentages...)
-	memPercentiles := uint64Slice(memUsages).Percentiles(memoryPercentages...)
-	self.CpuUsagePercentiles = intZipuint64(cpuPercentages, cpuPercentiles)
-	self.MemoryUsagePercentiles = intZipuint64(memoryPercentages, memPercentiles)
+	self.CpuUsagePercentiles = uint64Slice(cpuUsages).Percentiles(cpuPercentages...)
+	self.MemoryUsagePercentiles = uint64Slice(memUsages).Percentiles(memoryPercentages...)
 }
diff --git a/info/container_test.go b/info/container_test.go
index be36e69f..8735ef24 100644
--- a/info/container_test.go
+++ b/info/container_test.go
@@ -67,8 +67,8 @@ func TestPercentiles(t *testing.T) {
 	N := 100
 	data := make([]uint64, N)
 
-	for i := 0; i < N; i++ {
-		data[i] = uint64(i)
+	for i := 1; i < N+1; i++ {
+		data[i-1] = uint64(i)
 	}
 	percentages := []int{
 		80,
@@ -76,12 +76,17 @@ func TestPercentiles(t *testing.T) {
 		50,
 	}
 	percentiles := uint64Slice(data).Percentiles(percentages...)
-	for i, s := range percentiles {
-		p := percentages[i]
-		d := uint64(N * p / 100)
-		if d != s {
-			t.Errorf("%v percentile data should be %v, but got %v", p, d, s)
+	for _, s := range percentiles {
+		if s.Value != uint64(s.Percentage) {
+			t.Errorf("%v percentile data should be %v, but got %v", s.Percentage, s.Percentage, s.Value)
 		}
+		/*
+			p := percentages[i]
+			d := uint64(N * p / 100)
+			if d != s {
+				t.Errorf("%v percentile data should be %v, but got %v", p, d, s)
+			}
+		*/
 	}
 }