Added history fix