Addendum to the previous commit