Bugfix regarding the back button