diff --git a/src/drc/drc/built-in-macros/_drc_layer.rb b/src/drc/drc/built-in-macros/_drc_layer.rb
index b10bcd395..6c119936d 100644
--- a/src/drc/drc/built-in-macros/_drc_layer.rb
+++ b/src/drc/drc/built-in-macros/_drc_layer.rb
@@ -5950,10 +5950,10 @@ def _fill(with_left, *args)
           bx = 0.0
           by = 0.0
         else
-          bx = [ fc_box.width, row_step.x ].max
-          by = [ fc_box.height, column_step.y ].max
+          bx = [ fc_box.width, row_step.x.abs + column_step.x.abs ].max + [ -fill_margin.x, 0 ].max
+          by = [ fc_box.height, row_step.y.abs + column_step.y.abs ].max + [ -fill_margin.y, 0 ].max
         end
-        tp.tile_border(bx, by)
+        tp.tile_border(@engine.dbu * bx, @engine.dbu * by)
         tp.threads = (@engine.threads || 1)
 
         result_arg = "nil"
diff --git a/testdata/drc/drcFullTest_au1c.oas b/testdata/drc/drcFullTest_au1c.oas
index d70ef978e..110dbe5dc 100644
Binary files a/testdata/drc/drcFullTest_au1c.oas and b/testdata/drc/drcFullTest_au1c.oas differ
diff --git a/testdata/drc/drcSimpleTests_au43.gds b/testdata/drc/drcSimpleTests_au43.gds
index dfdfe8851..14df00e11 100644
Binary files a/testdata/drc/drcSimpleTests_au43.gds and b/testdata/drc/drcSimpleTests_au43.gds differ
diff --git a/testdata/drc/drcSimpleTests_au45.gds b/testdata/drc/drcSimpleTests_au45.gds
index 244fd3ade..8f5c2fabe 100644
Binary files a/testdata/drc/drcSimpleTests_au45.gds and b/testdata/drc/drcSimpleTests_au45.gds differ