XML Id Fix