fixes 40736