Addendum to #349