fixed bug: this and null keywords appear in the xml