Hotfix for deprecation