fixed bugs on android