back button dilemma fixes #4

back button dilemma fixes #4