fixed android bugs