Bug fix in XParser