back button fix #3