Addendum to previous commit