HOTFIX: use right API