I thought we had this fixed...If you put it in CVS then tell me and I'll close it, otherwise want to make sure it's not forgotten.
Created attachment 52693 [details, diff] patch for the bug Wrong object. Here is the patch we discussed on IRC.
InCVS