fixes 41658