Possible fix for Android