diff --git a/src/comblock/component.xml b/src/comblock/component.xml
index 184987a2d0775f152cddc143334519866bbda0aa..1d35e91ea228206f77cc8e7c6f85a6dbd60d6d80 100644
--- a/src/comblock/component.xml
+++ b/src/comblock/component.xml
@@ -1264,7 +1264,7 @@
         <spirit:parameters>
           <spirit:parameter>
             <spirit:name>viewChecksum</spirit:name>
-            <spirit:value>386f56c2</spirit:value>
+            <spirit:value>688b73e4</spirit:value>
           </spirit:parameter>
         </spirit:parameters>
       </spirit:view>
@@ -1280,7 +1280,7 @@
         <spirit:parameters>
           <spirit:parameter>
             <spirit:name>viewChecksum</spirit:name>
-            <spirit:value>386f56c2</spirit:value>
+            <spirit:value>688b73e4</spirit:value>
           </spirit:parameter>
         </spirit:parameters>
       </spirit:view>
@@ -1294,7 +1294,7 @@
         <spirit:parameters>
           <spirit:parameter>
             <spirit:name>viewChecksum</spirit:name>
-            <spirit:value>fca514b2</spirit:value>
+            <spirit:value>546f973c</spirit:value>
           </spirit:parameter>
         </spirit:parameters>
       </spirit:view>
@@ -1308,7 +1308,7 @@
         <spirit:parameters>
           <spirit:parameter>
             <spirit:name>viewChecksum</spirit:name>
-            <spirit:value>f4000786</spirit:value>
+            <spirit:value>21189fd0</spirit:value>
           </spirit:parameter>
         </spirit:parameters>
       </spirit:view>
@@ -1322,7 +1322,7 @@
         <spirit:parameters>
           <spirit:parameter>
             <spirit:name>viewChecksum</spirit:name>
-            <spirit:value>84ef4735</spirit:value>
+            <spirit:value>04647285</spirit:value>
           </spirit:parameter>
         </spirit:parameters>
       </spirit:view>
@@ -1336,7 +1336,7 @@
         <spirit:parameters>
           <spirit:parameter>
             <spirit:name>viewChecksum</spirit:name>
-            <spirit:value>f25248d4</spirit:value>
+            <spirit:value>b5f85374</spirit:value>
           </spirit:parameter>
         </spirit:parameters>
       </spirit:view>
@@ -3944,7 +3944,7 @@
       <spirit:file>
         <spirit:name>xgui/comblock_v2_0.tcl</spirit:name>
         <spirit:fileType>tclSource</spirit:fileType>
-        <spirit:userFileType>CHECKSUM_fca514b2</spirit:userFileType>
+        <spirit:userFileType>CHECKSUM_546f973c</spirit:userFileType>
         <spirit:userFileType>XGUI_VERSION_2</spirit:userFileType>
       </spirit:file>
     </spirit:fileSet>
@@ -4289,6 +4289,14 @@
       <xilinx:supportedFamilies>
         <xilinx:family xilinx:lifeCycle="Production">zynq</xilinx:family>
         <xilinx:family xilinx:lifeCycle="Production">zynquplus</xilinx:family>
+        <xilinx:family xilinx:lifeCycle="Production">artix7</xilinx:family>
+        <xilinx:family xilinx:lifeCycle="Production">artix7l</xilinx:family>
+        <xilinx:family xilinx:lifeCycle="Production">kintex7</xilinx:family>
+        <xilinx:family xilinx:lifeCycle="Production">kintex7l</xilinx:family>
+        <xilinx:family xilinx:lifeCycle="Production">spartan7</xilinx:family>
+        <xilinx:family xilinx:lifeCycle="Production">aartix7</xilinx:family>
+        <xilinx:family xilinx:lifeCycle="Production">aspartan7</xilinx:family>
+        <xilinx:family xilinx:lifeCycle="Production">azynq</xilinx:family>
       </xilinx:supportedFamilies>
       <xilinx:taxonomies>
         <xilinx:taxonomy>/Basic_Elements/Memory_Elements</xilinx:taxonomy>
@@ -4300,17 +4308,18 @@
       <xilinx:definitionSource>package_project</xilinx:definitionSource>
       <xilinx:vendorDisplayName>Multidiciplinary LABoratory of the ICTP</xilinx:vendorDisplayName>
       <xilinx:vendorURL>https://gitlab.com/rodrigomelo9/core-comblock</xilinx:vendorURL>
-      <xilinx:coreRevision>1</xilinx:coreRevision>
+      <xilinx:coreRevision>3</xilinx:coreRevision>
       <xilinx:upgrades>
         <xilinx:canUpgradeFrom>user.org:user:comblock:1.0</xilinx:canUpgradeFrom>
       </xilinx:upgrades>
-      <xilinx:coreCreationDateTime>2019-10-18T13:38:41Z</xilinx:coreCreationDateTime>
+      <xilinx:coreCreationDateTime>2022-12-01T13:02:42Z</xilinx:coreCreationDateTime>
+      
     </xilinx:coreExtensions>
     <xilinx:packagingInfo>
       <xilinx:xilinxVersion>2019.1</xilinx:xilinxVersion>
       <xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="1d322e02"/>
       <xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="2307bafe"/>
-      <xilinx:checksum xilinx:scope="fileGroups" xilinx:value="85a5ff74"/>
+      <xilinx:checksum xilinx:scope="fileGroups" xilinx:value="a6a34310"/>
       <xilinx:checksum xilinx:scope="ports" xilinx:value="46b61ac3"/>
       <xilinx:checksum xilinx:scope="hdlParameters" xilinx:value="5e0e7e39"/>
       <xilinx:checksum xilinx:scope="parameters" xilinx:value="2010891b"/>
diff --git a/src/comblock/hdl/fifo.vhdl b/src/comblock/hdl/fifo.vhdl
index 7b245058b65d12779a86da512fab9f169da431c4..8a483f670f7271e107227118d65957dae2f41b03 100644
--- a/src/comblock/hdl/fifo.vhdl
+++ b/src/comblock/hdl/fifo.vhdl
@@ -205,7 +205,7 @@ begin
    end process p_write;
 
    wr_ptr      <= next_ptr(wen, wr_ptr_r);
-   wcount      <= diff_ptr(wr_ptr, rd_in_wr_ptr);
+   wcount      <= diff_ptr(wr_ptr_r, rd_in_wr_ptr);
    full        <= '1' when wcount = EVEN_DEPTH else '0';
    full_o      <= full;
    afull_o     <= '1' when wcount >= EVEN_DEPTH-AFULLOFFSET else '0';
@@ -235,7 +235,7 @@ begin
    end process p_read;
 
    rd_ptr      <= next_ptr(ren, rd_ptr_r);
-   rcount      <= diff_ptr(wr_in_rd_ptr, rd_ptr);
+   rcount      <= diff_ptr(wr_in_rd_ptr, rd_ptr_r);
    empty       <= '1' when rcount = 0 else '0';
    empty_o     <= empty;
    aempty_o    <= '1' when rcount <= AEMPTYOFFSET else '0';