Addendum to last patch.