maybe fix for real this time.  code review, anyone?