fixes 42738