Fix the android support issue