Fix bug in handling of <data> tags.