Android Hotfix part 1