Issue #44: Bugfix with back button