Fixed broken history/back button (regression from 274cd8ef169)