History navigating hotfix.