[#72044854] first pass at fix