fix for broken add/remove