Added workaround for multi-addendum documents