hmm... yes, I'll rewrite this fix.