Fix H1 Report #38778 Take 3

supersedes #1636