fixed insert and remove