Bugfix add->remove