Fixed bug with Back button