Yes.  I'd meant to mention it isn't idempotent.  How do you recommend fixing it?