Fix history - issue #33 and #55