align/api hotfix