fixed context double deletion