fixes 40792