fixed bugs for Android