Bugfix.
Add/remove (code)