Critical fix needed for Android build.