Back button behavior fixed