avoid patch trouble by isolating troublesome line...