Fixing XML drama, take 4