fix history behavior