fixed for Android