Fixed bug with back button

Fixed #140