Android bug fix