Fix back button issue