fixed history problems