back button behaviour fixed