Fixed history issues