Fixed error in add/remove.