fixes 50928759