Android hotfix