back button fix #2