Add a fix for RT #122423