Hotfix for #3597