Added history fix #2