android some bug fix