Fixing one Android Wahala