fixes upstream issue #30891