diff --git a/bar.go b/bar.go
index 3a016b5..2edac1f 100644
--- a/bar.go
+++ b/bar.go
@@ -95,7 +95,7 @@
 	select {
 	case b.operateState <- func(s *bState) { result <- len(s.ewmaDecorators) != 0 }:
 		return newProxyReader(r, b, <-result)
-	case <-b.done:
+	case <-b.ctx.Done():
 		return nil
 	}
 }
@@ -111,7 +111,7 @@
 	select {
 	case b.operateState <- func(s *bState) { result <- len(s.ewmaDecorators) != 0 }:
 		return newProxyWriter(w, b, <-result)
-	case <-b.done:
+	case <-b.ctx.Done():
 		return nil
 	}
 }
@@ -151,7 +151,7 @@
 			s.refill = s.current
 		}
 	}:
-	case <-b.done:
+	case <-b.ctx.Done():
 	}
 }
 
@@ -170,7 +170,7 @@
 		for d := range iter {
 			cb(unwrap(d))
 		}
-	case <-b.done:
+	case <-b.ctx.Done():
 	}
 }
 
@@ -191,7 +191,7 @@
 			s.triggerComplete = true
 		}
 	}:
-	case <-b.done:
+	case <-b.ctx.Done():
 	}
 }
 
@@ -217,7 +217,7 @@
 			b.triggerCompletion(s)
 		}
 	}:
-	case <-b.done:
+	case <-b.ctx.Done():
 	}
 }
 
@@ -235,7 +235,7 @@
 			b.triggerCompletion(s)
 		}
 	}:
-	case <-b.done:
+	case <-b.ctx.Done():
 	}
 }
 
@@ -255,7 +255,7 @@
 			b.triggerCompletion(s)
 		}
 	}:
-	case <-b.done:
+	case <-b.ctx.Done():
 	}
 }
 
@@ -280,7 +280,7 @@
 			b.triggerCompletion(s)
 		}
 	}:
-	case <-b.done:
+	case <-b.ctx.Done():
 	}
 }
 
@@ -307,7 +307,7 @@
 			b.triggerCompletion(s)
 		}
 	}:
-	case <-b.done:
+	case <-b.ctx.Done():
 	}
 }
 
@@ -317,7 +317,7 @@
 func (b *Bar) DecoratorAverageAdjust(start time.Time) {
 	select {
 	case b.operateState <- func(s *bState) { s.decoratorAverageAdjust(start) }:
-	case <-b.done:
+	case <-b.ctx.Done():
 	}
 }
 
@@ -342,7 +342,7 @@
 		s.rmOnComplete = drop
 		b.triggerCompletion(s)
 	}:
-	case <-b.done:
+	case <-b.ctx.Done():
 	}
 }
 
@@ -380,7 +380,7 @@
 
 // Wait blocks until bar is completed or aborted.
 func (b *Bar) Wait() {
-	<-b.done
+	<-b.ctx.Done()
 }
 
 func (b *Bar) serve(bs *bState) {