Hotfix to fix api.