initial android fixing