back button issue fixed