fix changes before roolback