diff --git a/lib_xua/src/core/clocking/clockgen.xc b/lib_xua/src/core/clocking/clockgen.xc
index a9627072..e213fe88 100644
--- a/lib_xua/src/core/clocking/clockgen.xc
+++ b/lib_xua/src/core/clocking/clockgen.xc
@@ -517,6 +517,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, client interfa
 
                 /* Get preamble */
                 unsigned preamble = spdifRxData & SPDIF_RX_PREAMBLE_MASK;
+
                 switch(preamble)
                 {
                     /* LEFT */
diff --git a/lib_xua/src/core/main.xc b/lib_xua/src/core/main.xc
index 1bdee960..63f3d1be 100755
--- a/lib_xua/src/core/main.xc
+++ b/lib_xua/src/core/main.xc
@@ -138,7 +138,11 @@ on stdcore[XUD_TILE] : buffered in port:32 p_adat_rx        = PORT_ADAT_IN;
 #endif
 
 #if (XUA_SPDIF_RX_EN)
+#if (LEGACY_SPDIF_RECEIVER)
 on tile[XUD_TILE] : in port p_spdif_rx                      = PORT_SPDIF_IN;
+#else
+on tile[XUD_TILE] : buffered in port:32 p_spdif_rx          = PORT_SPDIF_IN;
+#endif
 #endif
 
 #if (XUA_SPDIF_RX_EN) || (XUA_ADAT_RX_EN) || (XUA_SYNCMODE == XUA_SYNCMODE_SYNC)