Bug Fix: Badly formed XML