Hotfix: Fix bug with back button