fix history support