Fixed: history bugs