diff --git a/src/circ/elem_def.h b/src/circ/elem_def.h
index da31945..c57dd66 100644
--- a/src/circ/elem_def.h
+++ b/src/circ/elem_def.h
@@ -45,11 +45,11 @@ public:
 
     cc_t connect() noexcept {
         for (unsigned k = 0;;) {
-            cc_t cur = cc_.load(std::memory_order_acquire);
-            cc_t next = cur | (cur + 1); // find the first 0, and set it to 1.
+            cc_t curr = cc_.load(std::memory_order_acquire);
+            cc_t next = curr | (curr + 1); // find the first 0, and set it to 1.
             if (next == 0) return 0;
-            if (cc_.compare_exchange_weak(cur, next, std::memory_order_release)) {
-                return next ^ cur; // return connected id
+            if (cc_.compare_exchange_weak(curr, next, std::memory_order_release)) {
+                return next ^ curr; // return connected id
             }
             ipc::yield(k);
         }
diff --git a/src/prod_cons.h b/src/prod_cons.h
index 5e075a9..0470bee 100644
--- a/src/prod_cons.h
+++ b/src/prod_cons.h
@@ -222,7 +222,7 @@ struct prod_cons_impl<wr<relat::single, relat::multi, trans::broadcast>> {
             // check all consumers have finished reading this element
             auto cur_rc = el->rc_.load(std::memory_order_acquire);
             if (cc & cur_rc) {
-                ipc::log("force_push: k = %d, cc = %d, rem_cc = %d\n", k, cc, cur_rc);
+                ipc::log("force_push: k = %u, cc = %u, rem_cc = %u\n", k, cc, cur_rc);
                 cc = wrapper->elems()->disconnect(cur_rc); // disconnect all remained readers
                 if (cc == 0) return false; // no reader
             }
@@ -292,12 +292,15 @@ struct prod_cons_impl<wr<relat::multi , relat::multi, trans::broadcast>> {
             el = elems + circ::index_of(cur_ct = ct_.load(std::memory_order_relaxed));
             // check all consumers have finished reading this element
             auto cur_rc = el->rc_.load(std::memory_order_acquire);
-            if (cc & (cur_rc & rc_mask)) {
+            circ::cc_t rem_cc = cur_rc & rc_mask;
+            if (cc & rem_cc) {
                 return false; // has not finished yet
             }
-            auto cur_fl = el->f_ct_.load(std::memory_order_acquire);
-            if ((cur_fl != cur_ct) && cur_fl) {
-                return false; // full
+            else if (!rem_cc) {
+                auto cur_fl = el->f_ct_.load(std::memory_order_acquire);
+                if ((cur_fl != cur_ct) && cur_fl) {
+                    return false; // full
+                }
             }
             // (cur_rc & rc_mask) should be 0 here
             if (el->rc_.compare_exchange_weak(
@@ -326,7 +329,7 @@ struct prod_cons_impl<wr<relat::multi , relat::multi, trans::broadcast>> {
             auto cur_rc = el->rc_.load(std::memory_order_acquire);
             circ::cc_t rem_cc = cur_rc & rc_mask;
             if (cc & rem_cc) {
-                ipc::log("force_push: k = %d, cc = %d, rem_cc = %d\n", k, cc, rem_cc);
+                ipc::log("force_push: k = %u, cc = %u, rem_cc = %u\n", k, cc, rem_cc);
                 cc = wrapper->elems()->disconnect(rem_cc); // disconnect all remained readers
                 if (cc == 0) return false; // no reader
             }