bug fix toggleRemove