Hotfix for history