fixed history related problems