fixed back button bug
merge
merge