Addendum to #322