issue #21601: Tweak for better user experience.