Fixing XML drama, take 3