fixed back button problem #99