Add option to force the controlling terminal