Arrow hotfix