I confirm the fix shared in #7 works. Attached patch to fix in nodes as well ...