Hotfix to ensure backwards compatibility