diff --git a/README.md b/README.md
index 22f219bc..8a1d9db7 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,13 @@
 
-![build](https://github.com/ramiroaisen/openstream-rs/actions/workflows/cargo-build.yml/badge.svg)
-![unit tests](https://github.com/ramiroaisen/openstream-rs/actions/workflows/cargo-unit-tests.yml/badge.svg)
-![integration tests](https://github.com/ramiroaisen/openstream-rs/actions/workflows/cargo-integration-tests.yml/badge.svg)
-![front server build](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-server-build.yml/badge.svg)
-![front server unit tests](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-server-unit-tests.yml/badge.svg)
-![front studio build](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-studio-build.yml/badge.svg)
-![front studio typecheck](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-studio-typecheck.yml/badge.svg)
-![front admin build](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-admin-build.yml/badge.svg)
-![front admin typecheck](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-admin-typecheck.yml/badge.svg)
-
+[![build](https://github.com/ramiroaisen/openstream-rs/actions/workflows/cargo-build.yml/badge.svg)](https://github.com/ramiroaisen/openstream-rs/actions/workflows/cargo-build.yml)
+[![unit tests](https://github.com/ramiroaisen/openstream-rs/actions/workflows/cargo-unit-tests.yml/badge.svg)](https://github.com/ramiroaisen/openstream-rs/actions/workflows/cargo-unit-tests.yml)
+[![integration tests](https://github.com/ramiroaisen/openstream-rs/actions/workflows/cargo-integration-tests.yml/badge.svg)](https://github.com/ramiroaisen/openstream-rs/actions/workflows/cargo-integration-tests.yml)
+[![front server build](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-server-build.yml/badge.svg)](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-server-build.yml)
+[![front server unit tests](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-server-unit-tests.yml/badge.svg)](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-server-unit-tests.yml)
+[![front studio build](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-studio-build.yml/badge.svg)](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-studio-build.yml)
+[![front studio typecheck](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-studio-typecheck.yml/badge.svg)](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-studio-typecheck.yml)
+[![front admin build](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-admin-build.yml/badge.svg)](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-admin-build.yml)
+[![front admin typecheck](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-admin-typecheck.yml/badge.svg)](https://github.com/ramiroaisen/openstream-rs/actions/workflows/front-admin-typecheck.yml)
 
 
 # Openstream Radio Streaming Server
diff --git a/rs/packages/spsc/src/lib.rs b/rs/packages/spsc/src/lib.rs
index b13be4e7..7118c9ab 100644
--- a/rs/packages/spsc/src/lib.rs
+++ b/rs/packages/spsc/src/lib.rs
@@ -73,11 +73,11 @@ impl Error for TryRecvError {}
 
 #[derive(Debug)]
 struct State<T> {
-  item: Option<T>,
   send_dropped: bool,
   recv_dropped: bool,
   recv_waker: Option<Waker>,
   send_waker: Option<Waker>,
+  item: Option<T>,
 }
 
 pub struct Sender<T> {