Small tweak at request of TWN