fixing history issues