fixed add/remove