diff --git a/alliance/share/cells/dp_sxlib/dp_rom4_nxr2_x4.vbe b/alliance/share/cells/dp_sxlib/dp_rom4_nxr2_x4.vbe
index e38c91a8..f7c6d3b2 100644
--- a/alliance/share/cells/dp_sxlib/dp_rom4_nxr2_x4.vbe
+++ b/alliance/share/cells/dp_sxlib/dp_rom4_nxr2_x4.vbe
@@ -25,6 +25,6 @@ BEGIN
   REPORT "wrong control signals on dp_rom4_nxr2_x4"
   SEVERITY WARNING;
 
-  q <= not (i0 xor i1);
+  q <= not (i0x xor i1x);
 
 END;
diff --git a/alliance/share/cells/dp_sxlib/dp_rom4_xr2_x4.vbe b/alliance/share/cells/dp_sxlib/dp_rom4_xr2_x4.vbe
index c1317970..ff955028 100644
--- a/alliance/share/cells/dp_sxlib/dp_rom4_xr2_x4.vbe
+++ b/alliance/share/cells/dp_sxlib/dp_rom4_xr2_x4.vbe
@@ -25,6 +25,6 @@ BEGIN
   REPORT "wrong control signals on dp_rom4_xr2_x4"
   SEVERITY WARNING;
 
-  q <= i0 xor i1;
+  q <= i0x xor i1x;
 
 END;
diff --git a/alliance/share/cells/dp_sxlib/dp_sff_scan_x4.vbe b/alliance/share/cells/dp_sxlib/dp_sff_scan_x4.vbe
index bcb132b3..ed25a65d 100644
--- a/alliance/share/cells/dp_sxlib/dp_sff_scan_x4.vbe
+++ b/alliance/share/cells/dp_sxlib/dp_sff_scan_x4.vbe
@@ -36,7 +36,7 @@ BEGIN
 
   label0 : BLOCK ((ckx and not (ckx'STABLE)) = '1')
   BEGIN
-    ff <= GUARDED ((scanx and scin) or (nscanx and ((wenx and i) or (nwenx and q))));
+    ff <= GUARDED ((scanx and scin) or (nscanx and ((wenx and i) or (nwenx and ff))));
   END BLOCK label0;
 
   q <= ff;
diff --git a/alliance/share/cells/dp_sxlib/dp_sff_x4.vbe b/alliance/share/cells/dp_sxlib/dp_sff_x4.vbe
index 4d056909..22300f6a 100644
--- a/alliance/share/cells/dp_sxlib/dp_sff_x4.vbe
+++ b/alliance/share/cells/dp_sxlib/dp_sff_x4.vbe
@@ -29,7 +29,7 @@ BEGIN
 
   label0 : BLOCK ((ckx and not (ckx'STABLE)) = '1')
   BEGIN
-    ff <= GUARDED ((wenx and i) or (nwenx and q));
+    ff <= GUARDED ((wenx and i) or (nwenx and ff));
   END BLOCK label0;
 
   q <= ff;