Hotfix for RT #352242