Fix for RT #79160