Line number bug fix patch from David Mosberger.