Fixed more of history bug after 2f65e6b (issue #35)