diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..27745e4a4147f823429cd1feb53e0f2be09a1be3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+#########
+# Ignore
+#########
+# Emacs
+#########
+*.*~
+*.*#
+################
+# Do NOT ingore
+################
diff --git a/src/templates/hdl/template_regbank.vhd b/src/templates/hdl/template_regbank.vhd
index fa97b192a43ade0b84b4db0cb39d19273a92bc53..493098813d0ad60d191c2b46335ad575c4f913a9 100644
--- a/src/templates/hdl/template_regbank.vhd
+++ b/src/templates/hdl/template_regbank.vhd
@@ -129,7 +129,7 @@ begin
         SAxiBValidxAS  : SAxiBValidxSO                              <= SAxiBValidxS;
         SAxiWReadyxAS  : SAxiWReadyxSO                              <= SAxiWReadyxS;
         SAxiAWReadyxAS : SAxiAWReadyxSO                             <= SAxiAWReadyxS;
-        WrValidxAS     : WrValidxS                                  <= SAxiWValidxSI;
+        WrValidxAS     : WrValidxS                                  <= SAxiWValidxSI and not SAxiAWValidxSI;;
         WrDataxAS      : WrDataxD                                   <= SAxiWDataxDI;
         WrAddrOutxAS   : WrAddrxD                                   <= WrAddrxDP;
         WrAddrxAS      : WrAddrxDN((C_AXI4_ADDR_SIZE - 1) downto 0) <= SAxiAWAddrxDI((C_AXI4_ADDR_SIZE - 1) downto 0) when