Fixed bug with back button
Merge pull request #142 from johnttan/fixback#140

Fixed bug with back button