Fix history behavior