Attempting to fix navigation issuue on android.