Android app bug fix