Fix issue with corrupting navigation stack.