modify before fix