fix history issue