Fixed bug in add/remove