Reply to iTunes Match overwriting Traktor metadata??

I'm pretty neurotic about 2 things: keeping my music backed up, and keeping my music library organized. I spend endless hours writing details into every form that Traktor has.

But when I subscribed to iTunes Match a couple of months ago, it seems like EVERY track I've bought since then can't retain the updates I make to the "Comments" field. They all revert back to "Purchased at www.beatport.com". This is killing me. Whole days of my life erased.

Does anyone else have this problem/know a solution?