fix history issues