histroy bug fixed