Fixed bug with back Button