fix for android
fix bugs on android