Should be replacing state in the history stack rather than pushing a new state.