(CW) Fix history problem