Oops.  REALLY fixing #5 this time.