Hack to fix the history-eating bug