Fix issue with back button