usfm2osis.py does not create proper OSIS references

I have a problem in osis2mod. The version I'm using says: "You are running osis2mod: $Rev: 3016 $"

The Sword installation was built three or four weeks ago from trunk. The problem occurs only when a footnote occurs after a cross reference which is in the same verse. It is very repeatable. When this combination is made into a module, the cross-reference is correctly formed in the module, but the footnote shows the content of the cross-reference instead of the footnote content. If I remove the cross-reference in its entirety, the footnote is correctly formed. The following OSIS fragment illustrates the input that results in the above. I'll be happy to supply the complete OSIS file if required.

This is the OSIS fragment.

<verse sID="Isa.49.6" osisID="Isa.49.6"/>
And he said to me, <transChange type="added">It is</transChange> a great thing for thee to be called my servant, to establish the tribes of Jacob, and to recover the dispersion of Israel: behold, <note type="crossReference" n="23">15.6: <reference>Acts 13. 47. </reference></note> I have given thee for the <note n="126">49.6: <hi type="italic">Gr. </hi> a perpetual covenant.</note> covenant of a race, for a light of the Gentiles, that thou shouldest be for salvation to the end of the earth.
<verse eID="Isa.49.6"/>

When I use osis2mod on it, I end up with the footnote showing "15.6: Acts 13. 47." instead of "Gr. a perpetual covenant."

This problem is seen whenever a cross-reference is followed by a footnote in the same verse.

If you require further tests etc. please ask.