bugfix with back button