Fix for Android intents