fix #38636: take 2