One more fix to FromXml transform