Fix history helper