Addendum to f36622d