Fix backstack issue