Fix for broken cast API call
Merge branch 'hotfix/cast'