diff --git a/internal/multiplex/bufferedPipe.go b/internal/multiplex/bufferedPipe.go
index 056fd09..4d2c4eb 100644
--- a/internal/multiplex/bufferedPipe.go
+++ b/internal/multiplex/bufferedPipe.go
@@ -7,7 +7,6 @@ import (
 	"errors"
 	"io"
 	"sync"
-	"sync/atomic"
 	"time"
 )
 
@@ -20,7 +19,7 @@ type bufferedPipe struct {
 	// only alloc when on first Read or Write
 	buf *bytes.Buffer
 
-	closed    uint32
+	closed    bool
 	rwCond    *sync.Cond
 	rDeadline time.Time
 }
@@ -39,7 +38,7 @@ func (p *bufferedPipe) Read(target []byte) (int, error) {
 		p.buf = new(bytes.Buffer)
 	}
 	for {
-		if atomic.LoadUint32(&p.closed) == 1 && p.buf.Len() == 0 {
+		if p.closed && p.buf.Len() == 0 {
 			return 0, io.EOF
 		}
 		if !p.rDeadline.IsZero() {
@@ -67,7 +66,7 @@ func (p *bufferedPipe) WriteTo(w io.Writer) (n int64, err error) {
 		p.buf = new(bytes.Buffer)
 	}
 	for {
-		if atomic.LoadUint32(&p.closed) == 1 && p.buf.Len() == 0 {
+		if p.closed && p.buf.Len() == 0 {
 			return 0, io.EOF
 		}
 		if !p.rDeadline.IsZero() {
@@ -97,7 +96,7 @@ func (p *bufferedPipe) Write(input []byte) (int, error) {
 		p.buf = new(bytes.Buffer)
 	}
 	for {
-		if atomic.LoadUint32(&p.closed) == 1 {
+		if p.closed {
 			return 0, io.ErrClosedPipe
 		}
 		if p.buf.Len() <= BUF_SIZE_LIMIT {
@@ -113,7 +112,10 @@ func (p *bufferedPipe) Write(input []byte) (int, error) {
 }
 
 func (p *bufferedPipe) Close() error {
-	atomic.StoreUint32(&p.closed, 1)
+	p.rwCond.L.Lock()
+	defer p.rwCond.L.Unlock()
+
+	p.closed = true
 	p.rwCond.Broadcast()
 	return nil
 }
diff --git a/internal/multiplex/datagramBuffer.go b/internal/multiplex/datagramBuffer.go
index 203b9b9..3b8d784 100644
--- a/internal/multiplex/datagramBuffer.go
+++ b/internal/multiplex/datagramBuffer.go
@@ -6,7 +6,6 @@ import (
 	"bytes"
 	"io"
 	"sync"
-	"sync/atomic"
 	"time"
 )
 
@@ -16,7 +15,7 @@ import (
 type datagramBuffer struct {
 	pLens     []int
 	buf       *bytes.Buffer
-	closed    uint32
+	closed    bool
 	rwCond    *sync.Cond
 	rDeadline time.Time
 }
@@ -35,7 +34,7 @@ func (d *datagramBuffer) Read(target []byte) (int, error) {
 		d.buf = new(bytes.Buffer)
 	}
 	for {
-		if atomic.LoadUint32(&d.closed) == 1 && len(d.pLens) == 0 {
+		if d.closed && len(d.pLens) == 0 {
 			return 0, io.EOF
 		}
 
@@ -70,7 +69,7 @@ func (d *datagramBuffer) WriteTo(w io.Writer) (n int64, err error) {
 		d.buf = new(bytes.Buffer)
 	}
 	for {
-		if atomic.LoadUint32(&d.closed) == 1 && len(d.pLens) == 0 {
+		if d.closed && len(d.pLens) == 0 {
 			return 0, io.EOF
 		}
 
@@ -104,7 +103,7 @@ func (d *datagramBuffer) Write(f Frame) (toBeClosed bool, err error) {
 		d.buf = new(bytes.Buffer)
 	}
 	for {
-		if atomic.LoadUint32(&d.closed) == 1 {
+		if d.closed {
 			return true, io.ErrClosedPipe
 		}
 		if d.buf.Len() <= BUF_SIZE_LIMIT {
@@ -115,7 +114,7 @@ func (d *datagramBuffer) Write(f Frame) (toBeClosed bool, err error) {
 	}
 
 	if f.Closing != C_NOOP {
-		atomic.StoreUint32(&d.closed, 1)
+		d.closed = true
 		d.rwCond.Broadcast()
 		return true, nil
 	}
@@ -129,7 +128,10 @@ func (d *datagramBuffer) Write(f Frame) (toBeClosed bool, err error) {
 }
 
 func (d *datagramBuffer) Close() error {
-	atomic.StoreUint32(&d.closed, 1)
+	d.rwCond.L.Lock()
+	defer d.rwCond.L.Unlock()
+
+	d.closed = true
 	d.rwCond.Broadcast()
 	return nil
 }