Fixing add/remove associated commands