fix #66486 making it cleaner, according to suggestion