fixed issue with hitting the back button