Daniel Polo-Wood / Android Fix