issue #22500: make hack as reasonable as possible