Forgot to fix bug for add / remove