[master] Do not need terminal modification any more