implement back button fix #15