Addendum to 711a42ed3c84f360714864a5c366e4f0a0c86157