This should of course be making sure that it's Remove if it's not Add and not just assume that it is.