LAC-28: fixing "delete" bugs