Fixing XML drama, take 5