Addendum to prev. commit