new attempt at fixing android