diff --git a/spatialyze/utils/F/contained_margin.py b/spatialyze/utils/F/contained_margin.py
index abd9478..bdde560 100644
--- a/spatialyze/utils/F/contained_margin.py
+++ b/spatialyze/utils/F/contained_margin.py
@@ -1,12 +1,13 @@
 from ...predicate import (
-    AtTimeNode,
     CallNode,
     GenSqlVisitor,
     LiteralNode,
     PredicateNode,
     TableAttrNode,
+    TableNode,
     call_node,
 )
+from .common import default_location as dl
 
 
 @call_node
@@ -17,11 +18,11 @@ def contained_margin(
 ):
     assert kwargs is None or len(kwargs) == 0, kwargs
     point, geom, margin = args
-    assert isinstance(point, TableAttrNode), point.__class__.__name__
+    assert isinstance(point, (TableAttrNode, TableNode)), point.__class__.__name__
     assert isinstance(geom, CallNode) and geom.name == "road_segment", geom.__class__.__name__
     assert isinstance(margin, LiteralNode) and isinstance(
         margin.value, (int, float)
     ), margin.__class__.__name__
 
-    point = AtTimeNode(point)
+    point = dl(point)
     return f"containedMargin({','.join(map(visitor, [point, geom, margin]))})"