Fixed the back button issue