maybe fix for RT #83320