chore: nw.struct follow-up
#3551
+28
−43
Merged
nw.struct follow-up
#3551