Issue #276 - Fix sourceId attribute in XML