Last change for previous bug.