Fixed back button issue with Map