untested changes (attempting to fix bug).  GOING FOR LUNCH mmm..