Fix history loader