WYC: bug fix for previous bug fix.  Now it's fixed!!