Android tool fix