fixed add/remove errors