Fix for RT #76938