diff --git a/libyang/schema.py b/libyang/schema.py
index 3f3bd4d..ce3dc9e 100644
--- a/libyang/schema.py
+++ b/libyang/schema.py
@@ -1396,6 +1396,18 @@ def when_conditions(self):
         for cond in ly_array_iter(wh):
             yield c2str(lib.lyxp_get_expr(cond.cond))
 
+    def when_conditions_nodes(self) -> Iterator[Optional["SNode"]]:
+        wh = ffi.new("struct lysc_when **")
+        wh = lib.lysc_node_when(self.cdata)
+        if wh == ffi.NULL:
+            return
+        for cond in ly_array_iter(wh):
+            yield (
+                None
+                if cond.context == ffi.NULL
+                else SNode.new(self.context, cond.context)
+            )
+
     def parsed(self) -> Optional["PNode"]:
         if self.cdata_parsed is None or self.cdata_parsed == ffi.NULL:
             return None
diff --git a/tests/test_schema.py b/tests/test_schema.py
index a310aad..4b002a1 100644
--- a/tests/test_schema.py
+++ b/tests/test_schema.py
@@ -843,6 +843,14 @@ def tearDown(self):
         self.ctx.destroy()
         self.ctx = None
 
+    def test_anydata(self):
+        snode = next(self.ctx.find_path("/yolo-nodetypes:any1"))
+        self.assertIsInstance(snode, SAnydata)
+        assert next(snode.when_conditions()) is not None
+        snode2 = next(snode.when_conditions_nodes())
+        assert isinstance(snode2, SAnydata)
+        assert snode2.cdata == snode.cdata
+
     def test_anydata_parsed(self):
         snode = next(self.ctx.find_path("/yolo-nodetypes:any1"))
         self.assertIsInstance(snode, SAnydata)