Addendum to last commit