Hopefully #10 fixed (ha-ha-ha)
src xpath handling improved