Fix add/remove logic