Fix ordering issue in XML - take 2.