fixed back button issue