diff --git a/src/PipelineBufferController.vhd b/src/PipelineBufferController.vhd
index 4f4af77..1beebe4 100644
--- a/src/PipelineBufferController.vhd
+++ b/src/PipelineBufferController.vhd
@@ -7,14 +7,14 @@ entity PipelineBufferController is
     generic (
         --@ Reset active at this level
         G_ResetActiveAt : std_logic := '1'
-    );
+        );
     port (
         --@ Clock signal; (**Rising edge** triggered)
-        I_CLK    : in  std_logic                    := '0';
+        I_CLK : in std_logic := '0';
         --@ Reset; (**Synchronous**, **Active at `G_ResetActiveAt`**)
-        I_RST    : in  std_logic                    := '0';
+        I_RST : in std_logic := '0';
         --@ Chip enable; (**Synchronous**, **Active high**)
-        I_CE     : in  std_logic                    := '1';
+        I_CE  : in std_logic := '1';
 
         --@ [1]: If low, data is passed through, else data is registered
         --@ [0]: Enable for register
@@ -22,46 +22,50 @@ entity PipelineBufferController is
 
         --@ @virtualbus AXI-Flags-In @dir In Input interface for AXI-like handshake
         --@ AXI like valid; (**Synchronous**, **Active high**)
-        I_Valid  : in  std_logic                    := '0';
+        I_Valid : in  std_logic := '0';
         --@ AXI like ready; (**Synchronous**, **Active high**)
-        O_Ready  : out std_logic                    := '0';
+        O_Ready : out std_logic := '0';
         --@ @end
 
         --@ @virtualbus AXI-Flags-Out @dir Out Output interface for AXI-like handshake
         --@ AXI like valid; (**Synchronous**, **Active high**)
-        O_Valid  : out std_logic                    := '0';
+        O_Valid : out std_logic := '0';
         --@ AXI like ready; (**Synchronous**, **Active high**)
-        I_Ready  : in  std_logic                    := '0'
-        --@ @end
-    );
+        I_Ready : in  std_logic := '0'
+     --@ @end
+        );
 end entity PipelineBufferController;
 
 architecture RTL of PipelineBufferController is
-    signal C_MUX        : std_logic := '0';
-    signal C_Enable     : std_logic := '0';
+    signal C_MUX    : std_logic := '0';
+    signal C_Enable : std_logic := '0';
 
     signal R_IsBuffered : std_logic := '0';
+    signal R_Ready      : std_logic := '1';
 begin
 
     --@ Set mux to buffered mode if data is available in the buffer.
     C_MUX    <= R_IsBuffered;
     --@ Enable the buffer register if not buffered and chip enable is high.
     C_Enable <= I_CE and not R_IsBuffered;
-    --@ Set the ready signal to high if not buffered.
-    O_Ready  <= not R_IsBuffered;
     --@ Set the valid signal to high if data is available in the buffer or if data is valid.
     O_Valid  <= R_IsBuffered or I_Valid;
 
+    O_Ready <= R_Ready;
+
     process (I_CLK)
     begin
         if rising_edge(I_CLK) then
             if I_RST = G_ResetActiveAt then
                 R_IsBuffered <= '0';
+                R_Ready      <= '1';
             elsif I_CE = '1' then
                 if R_IsBuffered = '0' and I_Valid = '1' then
                     R_IsBuffered <= '1';
+                    R_Ready      <= '0';
                 elsif I_Ready = '1' and (R_IsBuffered or I_Valid) = '1' then
                     R_IsBuffered <= '0';
+                    R_Ready      <= '1';
                 end if;
             end if;
         end if;