More fixed for Android