FIX up bad delete
Add context if exist