Fix AddRemove Bugs:001