fixed remove & toggle