Hotfix for #4202