fixed move and delete