Progress on fixing bug with xml parser