Fixed deletions to work properly