Finally fix change 2003-08-26, based on ideas from Chuck Silvers