bug fix for android