Attempt fix for Android extension