trying #1949 again, the trick that worked in #1948 for #1945

trying #1949 again, the trick that worked in #1948 for #1945 #7456