Fix backstack / back button bug