Removing bug that doesn't let the user go back