Hotfix for recent API change