Fixed broken XML caused by the merge of two unrelated pull requests